From da6a1c6f290243e65a7b5f017375d427a21173df Mon Sep 17 00:00:00 2001
From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Mon, 27 Aug 2012 16:47:58 +0000
Subject: [PATCH] debian-hardened-buildflags

Gbp-Pq: Name debian-hardened-buildflags.diff
---
 config_host.mk.in           |   4 ++++
 configure.in                | Bin 412542 -> 413011 bytes
 solenv/gbuild/LinkTarget.mk |   2 ++
 solenv/gbuild/gbuild.mk     |   5 +++++
 solenv/inc/unxgcc.mk        |   4 ++++
 5 files changed, 15 insertions(+)

diff --git a/config_host.mk.in b/config_host.mk.in
index 1ba5aa9ba63..e7f7cf3c0d4 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -62,6 +62,10 @@ export CPPUNIT_LIBS=@CPPUNIT_LIBS@
 export CPU=@CPU@
 export CPUNAME=@CPUNAME@
 export CDEFAULTOPT=@CDEFAULTOPT@
+export HARDEN_CFLAGS=@HARDEN_CFLAGS@
+export HARDEN_CXXFLAGS=@HARDEN_CXXFLAGS@
+export HARDEN_CPPFLAGS=@HARDEN_CPPFLAGS@
+export HARDEN_LDFLAGS=@HARDEN_LDFLAGS@
 export CPUNAME_FOR_BUILD=@CPUNAME_FOR_BUILD@
 export CPU_FOR_BUILD=@CPU_FOR_BUILD@
 export CROSS_COMPILING=@CROSS_COMPILING@
diff --git a/configure.in b/configure.in
index 22c8d52a1d15e17e4b017afa2a90c72fc0cdfa04..6069c884bac9bfc03e78c3cb7a16c6c98c5bdc14 100644
GIT binary patch
delta 419
zcmex2P4e<A$%Yoj7N!>F7M2#)Eo=fN(^HJuw0S)ogIrww;+@@m9NmMb&oXAytuIbZ
zQP53QDAw0a*Vk95Q9$thqoWOUjbmf=_0to$IAK~NBEXt$6H*GY({+<dGjmeXauU;v
z6?ApeQ%e+_q4EkwcKRu)W%_xgIXNh%qS;cfi`|-l0Q}ZK<&mvHIMT-juV$z;SZ@~8
xjR{<7nOu&}@xh@^!66zj&w`E7#1w~m5{nGfU6?XHF4Or~SwgnQn6N2{0{|}Ge6|1p

delta 31
ncmcaSOY+||$%Yoj7N!>F7M2#)Eo=fNldlN*Y&SGxQxXRN!A1&q

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e4185a03ed4..bddc0286e5e 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -54,6 +54,8 @@ gb_LinkTarget__get_objcflags=$(if $(OBJCFLAGS),$(OBJCFLAGS),$(call gb_LinkTarget
 gb_LinkTarget__get_cxxflags=$(if $(CXXFLAGS),$(CXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
 gb_LinkTarget__get_objcxxflags=$(if $(OBJCXXFLAGS),$(OBJCXXFLAGS),$(call gb_LinkTarget__get_debugcxxflags,$(1)))
 
+LDFLAGS += $(HARDEN_LDFLAGS)
+
 # Overview of dependencies and tasks of LinkTarget
 #
 # target                      task                         depends on
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index a787e145db8..6580ba6d99d 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -142,6 +142,9 @@ ifneq ($(strip $(ENVCFLAGSCXX)),)
 gb__ENV_CXXFLAGS := $(ENVCFLAGSCXX)
 endif
 
+gb__ENV_CXXFLAGS += $(HARDEN_CXXFLAGS)
+gb__ENV_CFLAGS += $(HARDEN_CFLAGS)
+
 include $(GBUILDDIR)/Helper.mk
 include $(GBUILDDIR)/TargetLocations.mk
 
@@ -268,6 +271,8 @@ ifeq ($(HAVE_THREADSAFE_STATICS),TRUE)
 gb_GLOBALDEFS += -DHAVE_THREADSAFE_STATICS
 endif
 
+gb_GLOBALDEFS += $(HARDEN_CPPFLAGS)
+
 gb_GLOBALDEFS := $(sort $(gb_GLOBALDEFS))
 
 include $(GBUILDDIR)/Deliver.mk
diff --git a/solenv/inc/unxgcc.mk b/solenv/inc/unxgcc.mk
index 02884fa120c..be62657f44b 100644
--- a/solenv/inc/unxgcc.mk
+++ b/solenv/inc/unxgcc.mk
@@ -264,6 +264,10 @@ LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
 LINKFLAGS += -Wl,-zdynsort
 .ENDIF
 
+LINKFLAGS += $(HARDEN_LDFLAGS)
+CDEFS += $(HARDEN_CPPFLAGS)
+CFLAGS += $(HARDEN_CFLAGS)
+
 # libraries for linking applications
 STDLIBGUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
 STDLIBCUIMT+=-Wl,--as-needed $(DL_LIB) $(PTHREAD_LIBS) -lm -Wl,--no-as-needed
-- 
2.30.2